Added "style_set" handlers.

Fri Dec 11 08:59:12 1998  Owen Taylor  <otaylor@redhat.com>

	* gtk/gtklistitem.c (gtk_list_item_style_set):
	* gtk/gtklist.c     (gtk_list_style_set):
	Added "style_set" handlers.

diff --git a/ChangeLog b/ChangeLog
index 0ddd8bafe4c0419baee7a5e36ef1a56b623f8415..83360af65621e217ee0a94a8a906c7c4609be0dd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Dec 11 08:59:12 1998  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtklistitem.c (gtk_list_item_style_set):
+       * gtk/gtklist.c     (gtk_list_style_set):
+       Added "style_set" handlers.
+
 Fri Dec 11 05:49:30 1998  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkclist.c (gtk_clist_style_set): Add in a "style_set"

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 0ddd8bafe4c0419baee7a5e36ef1a56b623f8415..83360af65621e217ee0a94a8a906c7c4609be0dd 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,9 @@
+Fri Dec 11 08:59:12 1998  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtklistitem.c (gtk_list_item_style_set):
+       * gtk/gtklist.c     (gtk_list_style_set):
+       Added "style_set" handlers.
+
 Fri Dec 11 05:49:30 1998  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkclist.c (gtk_clist_style_set): Add in a "style_set"

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 0ddd8bafe4c0419baee7a5e36ef1a56b623f8415..83360af65621e217ee0a94a8a906c7c4609be0dd 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Fri Dec 11 08:59:12 1998  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtklistitem.c (gtk_list_item_style_set):
+       * gtk/gtklist.c     (gtk_list_style_set):
+       Added "style_set" handlers.
+
 Fri Dec 11 05:49:30 1998  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkclist.c (gtk_clist_style_set): Add in a "style_set"

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 0ddd8bafe4c0419baee7a5e36ef1a56b623f8415..83360af65621e217ee0a94a8a906c7c4609be0dd 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+Fri Dec 11 08:59:12 1998  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtklistitem.c (gtk_list_item_style_set):
+       * gtk/gtklist.c     (gtk_list_style_set):
+       Added "style_set" handlers.
+
 Fri Dec 11 05:49:30 1998  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkclist.c (gtk_clist_style_set): Add in a "style_set"

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 0ddd8bafe4c0419baee7a5e36ef1a56b623f8415..83360af65621e217ee0a94a8a906c7c4609be0dd 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+Fri Dec 11 08:59:12 1998  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtklistitem.c (gtk_list_item_style_set):
+       * gtk/gtklist.c     (gtk_list_style_set):
+       Added "style_set" handlers.
+
 Fri Dec 11 05:49:30 1998  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkclist.c (gtk_clist_style_set): Add in a "style_set"

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 0ddd8bafe4c0419baee7a5e36ef1a56b623f8415..83360af65621e217ee0a94a8a906c7c4609be0dd 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Fri Dec 11 08:59:12 1998  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtklistitem.c (gtk_list_item_style_set):
+       * gtk/gtklist.c     (gtk_list_style_set):
+       Added "style_set" handlers.
+
 Fri Dec 11 05:49:30 1998  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkclist.c (gtk_clist_style_set): Add in a "style_set"

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 0ddd8bafe4c0419baee7a5e36ef1a56b623f8415..83360af65621e217ee0a94a8a906c7c4609be0dd 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Fri Dec 11 08:59:12 1998  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtklistitem.c (gtk_list_item_style_set):
+       * gtk/gtklist.c     (gtk_list_style_set):
+       Added "style_set" handlers.
+
 Fri Dec 11 05:49:30 1998  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkclist.c (gtk_clist_style_set): Add in a "style_set"

diff --git a/gtk/gtklist.c b/gtk/gtklist.c
index e7a9bc8393043b0c51b8e7e9c6c248dc4a66befa..18291954b0d8efa60a1d77a262583c7419c6bcb6 100644 (file)
--- a/gtk/gtklist.c
+++ b/gtk/gtklist.c
@@ -46,6 +46,8 @@ static void gtk_list_size_allocate   (GtkWidget            *widget,
 static void gtk_list_realize        (GtkWidget      *widget);
 static void gtk_list_map            (GtkWidget      *widget);
 static void gtk_list_unmap          (GtkWidget      *widget);
+static void gtk_list_style_set      (GtkWidget      *widget,
+                                     GtkStyle       *previous_style);
 static void gtk_list_draw           (GtkWidget      *widget,
                                      GdkRectangle   *area);
 static gint gtk_list_expose         (GtkWidget      *widget,
@@ -218,6 +220,7 @@ gtk_list_class_init (GtkListClass *class)
 
   widget_class->map = gtk_list_map;
   widget_class->unmap = gtk_list_unmap;
+  widget_class->style_set = gtk_list_style_set;
   widget_class->realize = gtk_list_realize;
   widget_class->draw = gtk_list_draw;
   widget_class->expose_event = gtk_list_expose;
@@ -806,6 +809,15 @@ gtk_list_expose (GtkWidget *widget,
   return FALSE;
 }
 
+static void 
+gtk_list_style_set     (GtkWidget      *widget,
+                        GtkStyle       *previous_style)
+{
+  g_return_if_fail (widget != NULL);
+
+  if (previous_style && GTK_WIDGET_REALIZED (widget))
+    gdk_window_set_background (widget->window, &widget->style->base[GTK_WIDGET_STATE (widget)]);
+}
 
 /* GtkContainer Methods :
  * gtk_list_add

diff --git a/gtk/gtklistitem.c b/gtk/gtklistitem.c
index 69be352a90331e6541917c5edcf5cb2c6589f52f..de9453687828d920b03438bb5e8c1a11a252d0a7 100644 (file)
--- a/gtk/gtklistitem.c
+++ b/gtk/gtklistitem.c
@@ -47,6 +47,8 @@ static void gtk_list_item_size_request      (GtkWidget        *widget,
                                             GtkRequisition   *requisition);
 static void gtk_list_item_size_allocate     (GtkWidget        *widget,
                                             GtkAllocation    *allocation);
+static void gtk_list_item_style_set         (GtkWidget        *widget,
+                                            GtkStyle         *previous_style);
 static void gtk_list_item_draw              (GtkWidget        *widget,
                                             GdkRectangle     *area);
 static void gtk_list_item_draw_focus        (GtkWidget        *widget);
@@ -182,6 +184,7 @@ gtk_list_item_class_init (GtkListItemClass *class)
   widget_class->realize = gtk_list_item_realize;
   widget_class->size_request = gtk_list_item_size_request;
   widget_class->size_allocate = gtk_list_item_size_allocate;
+  widget_class->style_set = gtk_list_item_style_set;
   widget_class->draw = gtk_list_item_draw;
   widget_class->draw_focus = gtk_list_item_draw_focus;
   widget_class->button_press_event = gtk_list_item_button_press;
@@ -440,6 +443,16 @@ gtk_list_item_size_allocate (GtkWidget     *widget,
     }
 }
 
+static void 
+gtk_list_item_style_set        (GtkWidget      *widget,
+                        GtkStyle       *previous_style)
+{
+  g_return_if_fail (widget != NULL);
+
+  if (previous_style && GTK_WIDGET_REALIZED (widget))
+    gdk_window_set_background (widget->window, &widget->style->base[GTK_WIDGET_STATE (widget)]);
+}
+
 static void
 gtk_list_item_draw (GtkWidget    *widget,
                    GdkRectangle *area)